fix segfault upon NULL return from gdk_utf8_to_string_target().

Fri Apr  5 01:06:15 2002  Tim Janik  <timj@gtk.org>

        * gdk/x11/gdkwindow-x11.c (set_text_property): fix segfault
        upon NULL return from gdk_utf8_to_string_target().

        * gdk/x11/gdkselection-x11.c (gdk_utf8_to_string_target): fix
        return value comment to mention NULL returns upon EMFILE.

diff --git a/ChangeLog b/ChangeLog
index 74b18219f32b9a5cf57460ef16934f1981b62a69..cf4123ae6a4f2fd45be627af8cddfb34a14cfa8d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Apr  5 01:06:15 2002  Tim Janik  <timj@gtk.org>
+
+       * gdk/x11/gdkwindow-x11.c (set_text_property): fix segfault
+       upon NULL return from gdk_utf8_to_string_target().
+
+       * gdk/x11/gdkselection-x11.c (gdk_utf8_to_string_target): fix
+       return value comment to mention NULL returns upon EMFILE.
+
 Thu Apr  4 22:35:42 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * tests/testgtk.c (menu_items): revert accidentally commited
@@ -34,6 +42,7 @@ Thu Apr  4 22:28:08 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
        static color.
 
 Tue Apr  2 11:10:13 2002  Jonathan Blandford  <jrb@redhat.com>
+
        * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the
        sort_func correctly, 77030
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 74b18219f32b9a5cf57460ef16934f1981b62a69..cf4123ae6a4f2fd45be627af8cddfb34a14cfa8d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Fri Apr  5 01:06:15 2002  Tim Janik  <timj@gtk.org>
+
+       * gdk/x11/gdkwindow-x11.c (set_text_property): fix segfault
+       upon NULL return from gdk_utf8_to_string_target().
+
+       * gdk/x11/gdkselection-x11.c (gdk_utf8_to_string_target): fix
+       return value comment to mention NULL returns upon EMFILE.
+
 Thu Apr  4 22:35:42 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * tests/testgtk.c (menu_items): revert accidentally commited
@@ -34,6 +42,7 @@ Thu Apr  4 22:28:08 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
        static color.
 
 Tue Apr  2 11:10:13 2002  Jonathan Blandford  <jrb@redhat.com>
+
        * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the
        sort_func correctly, 77030
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 74b18219f32b9a5cf57460ef16934f1981b62a69..cf4123ae6a4f2fd45be627af8cddfb34a14cfa8d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Fri Apr  5 01:06:15 2002  Tim Janik  <timj@gtk.org>
+
+       * gdk/x11/gdkwindow-x11.c (set_text_property): fix segfault
+       upon NULL return from gdk_utf8_to_string_target().
+
+       * gdk/x11/gdkselection-x11.c (gdk_utf8_to_string_target): fix
+       return value comment to mention NULL returns upon EMFILE.
+
 Thu Apr  4 22:35:42 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * tests/testgtk.c (menu_items): revert accidentally commited
@@ -34,6 +42,7 @@ Thu Apr  4 22:28:08 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
        static color.
 
 Tue Apr  2 11:10:13 2002  Jonathan Blandford  <jrb@redhat.com>
+
        * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the
        sort_func correctly, 77030
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 74b18219f32b9a5cf57460ef16934f1981b62a69..cf4123ae6a4f2fd45be627af8cddfb34a14cfa8d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Fri Apr  5 01:06:15 2002  Tim Janik  <timj@gtk.org>
+
+       * gdk/x11/gdkwindow-x11.c (set_text_property): fix segfault
+       upon NULL return from gdk_utf8_to_string_target().
+
+       * gdk/x11/gdkselection-x11.c (gdk_utf8_to_string_target): fix
+       return value comment to mention NULL returns upon EMFILE.
+
 Thu Apr  4 22:35:42 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * tests/testgtk.c (menu_items): revert accidentally commited
@@ -34,6 +42,7 @@ Thu Apr  4 22:28:08 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
        static color.
 
 Tue Apr  2 11:10:13 2002  Jonathan Blandford  <jrb@redhat.com>
+
        * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the
        sort_func correctly, 77030
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 74b18219f32b9a5cf57460ef16934f1981b62a69..cf4123ae6a4f2fd45be627af8cddfb34a14cfa8d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Fri Apr  5 01:06:15 2002  Tim Janik  <timj@gtk.org>
+
+       * gdk/x11/gdkwindow-x11.c (set_text_property): fix segfault
+       upon NULL return from gdk_utf8_to_string_target().
+
+       * gdk/x11/gdkselection-x11.c (gdk_utf8_to_string_target): fix
+       return value comment to mention NULL returns upon EMFILE.
+
 Thu Apr  4 22:35:42 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * tests/testgtk.c (menu_items): revert accidentally commited
@@ -34,6 +42,7 @@ Thu Apr  4 22:28:08 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
        static color.
 
 Tue Apr  2 11:10:13 2002  Jonathan Blandford  <jrb@redhat.com>
+
        * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the
        sort_func correctly, 77030
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 74b18219f32b9a5cf57460ef16934f1981b62a69..cf4123ae6a4f2fd45be627af8cddfb34a14cfa8d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Fri Apr  5 01:06:15 2002  Tim Janik  <timj@gtk.org>
+
+       * gdk/x11/gdkwindow-x11.c (set_text_property): fix segfault
+       upon NULL return from gdk_utf8_to_string_target().
+
+       * gdk/x11/gdkselection-x11.c (gdk_utf8_to_string_target): fix
+       return value comment to mention NULL returns upon EMFILE.
+
 Thu Apr  4 22:35:42 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * tests/testgtk.c (menu_items): revert accidentally commited
@@ -34,6 +42,7 @@ Thu Apr  4 22:28:08 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
        static color.
 
 Tue Apr  2 11:10:13 2002  Jonathan Blandford  <jrb@redhat.com>
+
        * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the
        sort_func correctly, 77030
 

diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index 3ddd69e036b7d5400775b4ae3d79db09ebd7b467..dc37ecc365f3b9a2817c0d3206e7a52c7976c215 100644 (file)
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -591,7 +591,8 @@ sanitize_utf8 (const gchar *src)
  * 
  * Return value: the newly-allocated string, or %NULL if the
  *               conversion failed. (It should not fail for
- *               any properly formed UTF-8 string.)
+ *               any properly formed UTF-8 string unless system
+ *               limits like memory or file descriptors are exceeded.)
  **/
 gchar *
 gdk_utf8_to_string_target (const gchar *str)

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index c3379f76ee9095db8bfebac4027c2f71fc35c7c5..912907d34883c5daf4c2c6055c0b59b54697ec45 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1819,7 +1819,7 @@ set_text_property (GdkWindow   *window,
     {
       prop_type = XA_STRING;
       prop_text = gdk_utf8_to_string_target (utf8_str);
-      prop_length = strlen (prop_text);
+      prop_length = prop_text ? strlen (prop_text) : 0;
       prop_format = 8;
     }
   else